minor changes
A big commit :)