set to sourceonly; added a few more bits and pieces