working on style
found bugs, worked on style