lots of fixes getting closer