more cleaning, still not happy tbh but it'll do for now.