Small changes, cleanup, file handling.