minor fixes, will squash this commit later