A few more changes. Should probably be tested more.