first fixes in initalize