changed devs ame and fixed minor bug