Fixed various issues and TODOs