further haml changes