More changes to player mechanism; fixed a bug