Fixes #11

Also improved "cleanup players props" a bit