fixed minor bugs, added TODO list