fixing a couple bits