updated todos
improved entry filter and fixed tests