Added mapistry and a few other improvements