Merge from appendix and fix repo