Organized the customization code a little bit better and added a few
things here and there.