Minor additions and changes