lots of improvements here and there
some bug fixes, some improvements here and there..