Did some updates on the constructor, also includes some fixes.