some improvements.

As a note, __construct is a void function I think.