Bug fixing

Merge in new point system for feedback