added templates for OZ, fixed bug in macros
added missed files