update todo and fixme
removed unused code, improved scan result handling