Some more changes to proj 1