clean-up and better comments on hacks