Revising geometric factor computation
Miscellaneous changes to various files