Now submitting, fixed glitches