some further improvements, also geometry indices removed in favour of g_hi