fixed all minor problems