Cleaned up some unnecessary comments and added TODO for Tim.
TODO: Make the native map work.