Feature/entry improvements

See commits