Cleanup comments, debug and typos.