Various updates up to commit 191b768