Bug fixes, UI and readme updates