Some fixes, but consume! is broken