Changes toward working mainly offline.
minor changes