removed todo's fixed with last commit