Several remaining bugs.