Fixes
  Update docs
  Add {import ... from ...}
  Improve parsing