Fixes and updates to the file