fixing pan issues, deleting major commented out code, minor updates