Improve making.
Add some other functions.
Move code around a little.
Some other changes I made a few days back.