small changes including add ons from westerhack