added back Owl.cpp, removed Patch code
tidied up