Transformations, bugfixes and etc..