fix initialization stuff