Small improvement
Fixing logic
Fixing messsage formatting
Fixing instances of undefined author