Finished quality improvements