fixes, getting closer