Remove debugging lines
Send marker clicks to the correct handler
Add more messages
Use correct wording
Display correct message for errors