huge updates, UI tweaks