included additional bug fixes * fields' initialization