things to fix - in my opinion