More work on tricky bit, file cleanups.