Bookediting

I fixed the problem you had Luke, but discovered something else that we'll have to fix. See detailed commit messages.