updated server with latest
fixed various bugs & issues