Updating comments and ensuring file is loaded properly