lots off additions

fixed stufff