fixed some more minor problems