fixed the minorest of issues