Some final fixes

Looks clearer