a few random things, not happy with it, some refactor is up next