changed geometry a bit, ran some tests