code review, fixes, cleanup