getting close to having better file handling, various fields improvements