changed code, added odfWeave stuff
fixed odfWeave, not clean