Fixed minor problems 1 left