better ago handling, ui polish