Major Update

Updated files to match recent FREEVAL Updates
Major Update part 2