Added some additional fixes for the changes made yesterday, and added some extra preliminary variables that can be modified/tuned.