Updates and fixes for chaosreader