Cleaned up TODO's
Edited gmail connectivity checker