Fixed several bugs (please refer to Email)

Also updated WaterModel and GSDBuildingInterface jars. If you have
trouble, please consult the DropBox for jar files.