Updating Final Comments and fixing one little bug...