geometry additions and fixes