fixes in spec stylesheet and model conflicts