file context "improvements" (still a mess)

Signed-off-by: Dominick Grift <dac.override@gmail.com>