Added logging

> Improved comments
> Fixed author comments