Update to 0.9 Beta

Updates and corrections