-Added option for turning off clustering. #526

-Made maps properly save location.