Improvements to advantages

Still not there yet, but progress is being made!