make system selector reflect reality a bit more

this is not good code