More map options and some plyr code