Added Multiple Player mappings and code cleanup

Added Multiple Player mappings and code cleanup