Think I have final layout of chapters + fixed partitioning bug