Express work done

Including various misc work and the bookstore