Some CLP clean-up and started work on map/chunk loading