added in fixmes and fixed an error
added in the prop list
echo server from dist programming lesson
added example useage in the comments
merge from upstream