More bug fixes, almost there.