removed FIXME and TODO items and moved them to issues
Fixed several bugs
Merge pull request #1 from WileESpaghetti/master

Syncing with latest changes