Better activity indicator, misc tweaks