-fixing bugs getting closer