Ideas for improvement, minor fixes.