improvements
some more stuff