some peeps have been fixed