Fixed weird pointer problem for File class & resolved some TODO's