Better map attribution. Closes #6