Corrected underrun problems + minor corrections