The Eighteenth Commit

Some small fixes inside schedule