added some docs, some code changes
