fixing more ?'s