fixing a few old problems