More bug fixes

Removed the zsh source function calls.
Fixed some NPM installation stuff.