improved title display
added todo