Fixed building, parameter tweaking