Cole's fixes for locations, and new CLI function for removing makers.