Project fs handling

This fixes issue #223, #231, and #235