Bug fix, readme updates