Fixed all from feedback session.