* fixed some initialization issues