bugfix, style fixes