v2 - minor fixes, beautifications