still working on it, a few other tweaks made, and a few more planned