Fixed inits, added logging