Update: makefiles, sphinx docs, tests