Fixes #2, Fixes #3
Fixes #1
Converted FIXME and TODOs into Github issues.