plug together changes throughout the whole project
Merge pull request #32 from tsamb/SRB/cleanup_plugging_together

plug together changes throughout the whole project