Added some nice commenty bits