patched version
minor fixes

+++ Yabbervox +++

