Fixes to everything...... almost functioning.