Final Maching of elements done

Fixing issues. Need to do finilize more..