a few bugs and ui flaws fixed