updates to shell, simple makefile included