package and style fixes