some nice things

Change-Id: Id8dbc9029ef1190b2acbbab65b23ed7d6a3b706a