Minor Bug Fixes.
New files coming into effect soon.