Commit 13: Added Hybrid maps.  Added ability to center on self. Cleaned up some comments and code.