beginning of 0.8.11 updates