Commented out new feature code
Fix for audio problem
Moved a log entry around
Merge branch 'BETA'