a couple of @mpharrigan's comments and WIP stuff