Bugfixing & Tuning

Signed-off-by: cGIesen <info@klick-punkte.info>