replacing exit with returns in commands, removing loading message from plugin