getting closer.. final tweaks