Final Adjustments

A few final tweaks to the code