more geometry and fixes