Updated player and stuff to allow for module injection. Some changes and bug fixes related to getting that to work.