Cleanup, bugs & comments