A truck load of updates/fixes/tweaks