A few more cosmetic changes as well as trying to fix (viewmaps).