fixed couple of issues