new doll stuff and fixed bugs