Fixed some issues from feedback version 2