small tweaks, make it ready to deploy to app engine cloud