Bugfixesa and improvements to design