quil-plus better organized, kruft removed