some code improvements + new build