adjustments to ui, and other bug fixes..