More stability changes

The stability traits are still meaningless for now, I need to do this
with more detail later