Various Additions/Fixes
Fix Critical Bug