Clean up this a little bit, tried to get rid of some of the warnings.
Added this constructor to be able to construct an instance that is valid right after construction time.