Various changes and commenting