fixed 3 small issues