Moved to GAE and minor updates