f279cb9 tweaks and everything else