further player changes, code is kinda messy still. Also updating angular to latest version of 1.2