Updates.

I saw a mistake, and I made some updates to the __construct function.