Updated to 1.2, and made some minor changes