hmmmm another update, more cleanup