better display, address check, comments