fixed the leftover tidbits and bugs