Added geometry saving along with a few other tweaks and bug fixes.