Fixes, removed debugging