cleanup & pin marker fix