Several small improvements

o changes in class file to improve layout of appendix section