Address all comments

 sonic-un@sonic-underground.com