fixed multiple issues