Debugged last commit and added some user-friendlyness