small changes to file storage etc...