Bug fixes. and readme updates