merge into dev carandraugs fixes made in master