diff --git a/sequpgrade.sh b/sequpgrade.sh
index 0cee7dd..ad741c2 100755
--- a/sequpgrade.sh
+++ b/sequpgrade.sh
@@ -70,8 +70,13 @@ makechanges() {
     exe sed ${inplace} 's/echoerr " \[W\] /warning -e "/'${sedprint} "${file}"
     exe sed ${inplace} 's/echoerr " \[E\] /error -e "/'${sedprint} "${file}"
     exe sed ${inplace} 's/echoerr/error -e/'${sedprint} "${file}"
+
+    exe sed ${inplace} 's/echo " \[I\] /info "/'${sedprint} "${file}"
+    exe sed ${inplace} 's/echo " \[W\] /warning "/'${sedprint} "${file}"
+    exe sed ${inplace} 's/echo " \[E\] /error "/'${sedprint} "${file}"
     
     exe sed ${inplace} 's/outColor/color/'${sedprint} "${file}"
+    exe sed ${inplace} 's/endReturn -o \$?/endReturn/'${sedprint} "${file}"
 
     exe sed ${inplace} 's/"*${*DEFAULT_EDITOR_SYSTEM}*"*/editor/'${sedprint} "${file}"
 
@@ -89,6 +94,9 @@ makechanges() {
     exe sed ${inplace} \
       's/^\(step_\([0-9]\+\)_info().*\)echoinfoArgs[[:space:]]\+"\([^"]\+\)"\;[[:space:]]*\(.*\)/\1\4\nstep_\2_options() { echo "\3"; }/'${sedprint}\
       "${file}"
+
+    # Remove trailing spaces
+    exe sed ${inplace} 's/[[:space:]]\+$//'${sedprint} "${file}"
   done
 }