lots of small changes to fix vairous methods, comment, etc. however, still does not pass testPlayout