Fix Small Bugs And know make it more convents to others