cleanup

forgotten thing and those todos are more like ideas