Debug-Messages and some Fixes