adds things promised in last commit.

	i know this can be fixed with git, but i'm not going to.