added charm, updated server slammer, minor updates,