Added some doxy-style comments