fixing multiple issues