Add location indicator, fix various bugs