Added some more user-friendlyness
Added some more user-friendlyness