Fixed bugs

Still Null Error sometimes..