fixed various small issues