fixed docs, comments
fixed merge conflicts