Edited todo and added bugs.