lots of fixes like overflow on rh column and some code review updates