Appendices, some todos and minor fixes