big fixes to everything