Model adjustments

Made a few changes to models and adjusted controllers
re-attempt...

trying again...