lots of edits and niphlod patch
improved references