More things!

More things were added and fixed.