A few client feedback tweeks implemented.