added makefile
fixed typos in userguide
updated user guide