various updates, fix proj form/associations