fixings some minor problems