Minor updates. Mail portion done soon