Adding comments, and hopefully making things faster