24th Commit. Final fixes. Dones.