lots 'o stuff

duplicates handled, files & code cleaned up... see commit notes for more info.