some things were accidentally left out of last commit