Preparing for FINAL 3.0, many fixes, cleanup.