Index: mppenc/branches/zorg/src/ans.c
===================================================================
--- mppenc/branches/zorg/src/ans.c	(revision 86)
+++ mppenc/branches/zorg/src/ans.c	(revision 87)
@@ -159,5 +159,5 @@
                  const float*          smr0,
                  const float*          smr1,
-                 const int             scf [] [3],
+                 int                   scf [32] [3],
                  const int             Transient [32] )
 {
Index: mppenc/branches/zorg/src/bitstream.c
===================================================================
--- mppenc/branches/zorg/src/bitstream.c	(revision 86)
+++ mppenc/branches/zorg/src/bitstream.c	(revision 87)
@@ -71,7 +71,7 @@
     size_t           WrittenDwords = 0;
     const Uint32_t*  p             = buffer;
-    size_t           CC            = words32bit;
 
 #if ENDIAN == HAVE_BIG_ENDIAN
+    size_t           CC            = words32bit;
     Change_Endian32 ( (Uint32_t*)buffer, CC );
 #endif
Index: mppenc/branches/zorg/src/encode_sv7.c
===================================================================
--- mppenc/branches/zorg/src/encode_sv7.c	(revision 86)
+++ mppenc/branches/zorg/src/encode_sv7.c	(revision 87)
@@ -134,5 +134,5 @@
 
 static void
-test ( const unsigned int* const Res, const int* q )
+test ( const int* const Res, const unsigned int* q )
 {
 #if 0
Index: mppenc/branches/zorg/src/mppenc.c
===================================================================
--- mppenc/branches/zorg/src/mppenc.c	(revision 86)
+++ mppenc/branches/zorg/src/mppenc.c	(revision 87)
@@ -39,6 +39,6 @@
 int           PredictionBands =  0;
 int           CombPenalities  = -1;
-extern float  KBD1            =  2;
-extern float  KBD2            = -1.;
+float         KBD1            =  2;
+float         KBD2            = -1.;
 int           DisplayUpdateTime = 1;
 int           APE_Version     = 2000;
@@ -334,5 +334,5 @@
              "  --radio          (--quality 4.00)   medium quality        (~ 130 kbps)\n"
              "  --standard       (--quality 5.00)   high quality, (dflt)  (~ 180 kbps)\n"
-             "  --extreme        (--quality 6.00)   excellent quality     (~ 210 kbps)\n"
+             "  --insane         (--quality 7.00)   excellent quality     (~ 240 kbps)\n"
              "\n"
 
@@ -340,8 +340,8 @@
              "  mppenc inputfile.wav\n"
              "  mppenc inputfile.wav outputfile.mpc\n"
-             "  mppenc --extreme inputfile.wav outputfile.mpc\n"
+             "  mppenc --insane inputfile.wav outputfile.mpc\n"
              "  mppenc --silent --radio inputfile.wav outputfile.mpc\n"
              "\n"
-             "For further information see the file 'MANUAL.TXT' or use option --longhelp.\n" );
+             "For further information use option --longhelp.\n" );
 }
 
@@ -1804,6 +1804,6 @@
             }
 
-            Allocate ( Max_Band, Res_L, X[0].L, SCF_Index_L[0], SNR_comp_L, SMR.L, Power_L, Transient );   // allocate bits for left + right channel
-            Allocate ( Max_Band, Res_R, X[0].R, SCF_Index_R[0], SNR_comp_R, SMR.R, Power_R, Transient );
+            Allocate ( Max_Band, Res_L, X[0].L, SCF_Index_L[0], SNR_comp_L, SMR.L, (const SCFTriple*) Power_L, Transient );   // allocate bits for left + right channel
+            Allocate ( Max_Band, Res_R, X[0].R, SCF_Index_R[0], SNR_comp_R, SMR.R, (const SCFTriple*) Power_R, Transient );
 
             Quantisierung ( Max_Band, Res_L, Res_R, X, Q );             // quantize samples
@@ -1835,8 +1835,8 @@
         memmove ( Main.S, Main.S + BLOCK, CENTER * sizeof(float) );
 
-		if ( AllSamplesRead + BLOCK > SamplesInWAVE )
-		{
-			int n = 0;
-		}
+		//if ( AllSamplesRead + BLOCK > SamplesInWAVE )
+		//{
+		//	int n = 0;
+		//}
 
         // read samples
Index: mppenc/branches/zorg/src/psy.c
===================================================================
--- mppenc/branches/zorg/src/psy.c	(revision 86)
+++ mppenc/branches/zorg/src/psy.c	(revision 87)
@@ -896,5 +896,5 @@
 #else
 static void
-CalcShortThreshold ( const float  erg [4] [128],
+CalcShortThreshold ( float        erg [4] [128],
                      const float  ShortThr,
                      float*       thr,
@@ -1015,6 +1015,6 @@
     SMRTyp   SMR0;
     SMRTyp   SMR1;                                              // holds SMR's for first and second Analysis
-    int      isvoc_L;
-    int      isvoc_R;
+    int      isvoc_L = 0;
+    int      isvoc_R = 0;
     float    factorLTQ  = 1.f;                                  // Offset after variable LTQ