little cleanup + resolved some missing things