Made some quick fixes
Adding changes