Added simple change to main client and some otehr random crap