Fixes bugs and implements changes according to client feedback