fixing a couple bugs