Multiple code fixes, README updates