updated shell-init
updated Makefiles