remove old debugs
some indentation cleanups, and fixes to everything breaking due to binding regression