Comments + cleanup of QUIT