removed gmail failsafe
added some basic comments