changes partials structure, and some comments