fix multiple issues