Added comments
A bit changes