(#37) Fixed some click handler and marker bugs. A couple bugs remain.