adding in some fixes