Updates to code and readme