Fixed some Bugs in L2 relating to file architecture.