Improved feedback code, added feedback to main activity.