cleaning stuff up, fixing throttling