Added npm and minor edits