Added line numbers and some other personalizations