Fixed positioning code and consolidated.  Refactored.  Re-added tracking areas