An attempt to integrate the changes everyone has made. Please edit at will.