fixes during first debug