Fixes and  TODO-commands