Improved the initialization. Final debug tomorrow.