remove .m~ files from repo
more fixes