Improving FeedbackStore
Fixes bugs