File structure, some minor stuff added