Branch cleanup and minor site fixes