more prototypos fixed