Many minor tweaks