README update, bug fixes