updated some things, geting ready for push to qa server