Bug fixes, new build