Palanquin 15 August

Updates and bug fixes