done, also improved a couple of things :)