bring inline with my test branch

* major clean up
* echo fix
* GSP fix " still some issues"