Few TODOs removed + warnings cleared up