Lots of small changes :)