fix bugs. making progress.