working on bugs, and cleanup. IE the todo list