Some more files
Some fixes