Commit of new FMD3 geometry and other geometry related issues.