Added some of Felix changes as well as added David as author
added some refs