Bigfixes + style