Minor Updates and Testing