Solved some issues and fixme
Revised docs and minor edits