Rewrote some methods in the HaikuGenerator class and small changes to
some other files.