added map application
some bug fix and commit before making some changes due to performance drop