Bug fixes

Updated TODO
fixed #6
fixed #9
closed #2
closed #1