Cleanup. Better File class. Console fixes