Fixed problems preventing running, added development TODOs