multiple fixes and additional geometry class