Added things and fixed things