With minor bug fixes