Small changes and more inline comments