recent commits

Look things over before merging