Debug Stuff and Comment Cleanup