Modifications for style and some adds

* the mail queue modified
* fix locate modified