edgar scan take 1
edgar take 2 . bug fixes