debug removed, micro changes