Final touches 2, waiting on last audio fix