couple of init modifications