mostly style fixes and trying to understand whats going on...