Many improvements and fixes
Flag new files as temporary (used for testing)