bugfixes, getting closer