more geometry changes, some stuff seems not quite right though