Code and readme updates