cleaned up code
refactored more
current location is working fine, it is the DBC computers