Updated a few things.  Mostly just testing things for map drawing.