Various updates, time to commit