Improved geometry implementation, better AO