changes to support environment bucket name
fix marker addition after comment
fix devise from email