baseline features fixed; adding external dictionary pending