Screaming Loaf: Bug fixes

Bug fixes and performance improvements.