maintainance and some minor look and feel changes