small changes everywhere, nothing broken; yolo no tests