Various updates
Pulled feature/29