Add pretty msg and take off n+1 problem

:lollipop: