Fix old name
Bugfixes
Style changes