improved initialization, removed some comments