Clean up some files and robustify README