Fixing things after code review... still not done