Fix %eyre bugs, performance problems, etc.