Added comments/doc strings
Fixed username reference