apparently I left some stuff uncommitted, not sure what