refactored | make it run | fixing bugs

fixes #8