Marked some bugs and TODOs