fixed some constructor stuff