Refinements

I noticed a few things that might be required (dynamic classes!) and a few things I tweaked to make them easier to work with/ make more sense for the user. Also killed a few errors here and there :)