Lu's bugfixes + improved book insert