fixed  issues (still have some)