Fixed bash/shell in Makefiles; Addd return statements to main() functions