tweaks and moving some things up to the class level

here's the code i sent over im and a couple other tweaks.