final changes usability testing, fix small bug