Added files from SKAT maskine
Minor updates and changes to scripts