Misc fixes and README changes