More cleanup, all steps now work, added todo to readme