more style fixes, some crap added