fixing docs, bugs