New style, some minor bug fixes