tweaked a bunch of stuff in the UI.
fixed merge issues.