fixed last imperfections ;)