Various updates, will squash with more meaningful message later

Various updates, will squash with more meaningful message later #1139