New quarantine + misc bug fixes