all files + fixes