still going to continue tweaking this but, this is a big improvement

@lauraxt r?