Further additions and changes