few bug corrections + removed debug notifications