* minor changes
* cleaned up code a little bit, still buggy for now