Misc updates made when merge Point/Map into Risse's Admin folder.