code review, initial things fixed. need to refactor a lot of code