Added setup to both init methods; typo on property setter