Enhancements

Hey, sorry -- ignore my last pull request, looks like I left out a few commits.