add doxanaki + minor fixes