Corrected various things...