bug fixes, UI polish, removed unnecessary log calls