updated build, small tweaks here and there