Readme updates and some fixes to form and function