fix up less bugs