office -  added many things. Modified loops etc.