better comments + fixes