Fixed a lot of stuff (Contd.)

For some reason, the previous commit did not include these files. So
here goes...