getting closer to bug-fixing...