merging in some master changes and working on maps