changed some more stuff, gen improvements, and imrpved header