finished cleaning up most of the code and adding contracts
updated to EPSG 8.1