Debug

fixed some issues...
Revert "Debug"

This reverts commit 58f0992ce037fc2275e1f7c50e39f91d2dda514d.