argument name changed and made optional
short name wrapper function for addBaseMap added
clean-up + comments
merge