Missing 'echo's here and there

Also simplified them using -e and \n instead of echo ""

Has not been tested :)