Minor changes

Made some more testing