added m4 folder + minor updates