fixing a few things here and there