SMall bug fixes and UI changes.