1823 matt fixed a few errors