Remove old build
Bugfixes and improvements