Some changes and one fix

The author part was fixed here