Add few todo's and fixes