Forgot to make entire dir & other cleanups