Final Changes for Pre-Alpha 1.0