-Fixing some last chunks of client, perfectly compatible with wahab's, i
dareso even moreso since his is littered with bugs