annex fixes, streamlining config