stability and cosmetic fixes