Added more checks/tests
Added numeric lookup, minor implementation changes