fixed general issues