More warnings removed
Fixed some TODOs