General Fixes/Addtions