merged changes, added some crypto stuff, and fixed same client/server debugging