some style fixes, fixtures fixes