updated a few things, a bit all over the place at the moment