Bug fixes
UI:
rest of Commit.