Fixes to source and read me