Fixes from Graeme, minify, clean bad files