Add to and improve setup file.