filenames.haml FIXED
some other fixes