Fixed some bugs, and commented out most of my audio code as it was the
source of many errors since it wasn't fully implemented.
fixed some bugs, and trying to commit... for some reason Git is stopping me. hope this one works.
fixed merge conflicts