Fixed some bugs, cleaned the code
Fixed some bugs, cleaned the code

tyb0807/angr,terry2012/angr,avain/angr,GuardianRG/angr,lowks/angr,axt/angr,tyb0807/angr,axt/angr,schieb/angr,zhuyue1314/angr,GuardianRG/angr,avain/angr,lowks/angr,chubbymaggie/angr,terry2012/angr,fjferrer/angr,f-prettyland/angr,f-prettyland/angr,axt/angr,xurantju/angr,cureHsu/angr,angr/angr,mingderwang/angr,schieb/angr,mingderwang/angr,iamahuman/angr,xurantju/angr,schieb/angr,chubbymaggie/angr,haylesr/angr,tyb0807/angr,haylesr/angr,angr/angr,iamahuman/angr,angr/angr,chubbymaggie/angr,zhuyue1314/angr,f-prettyland/angr,iamahuman/angr,cureHsu/angr,fjferrer/angr