Small changes, working on type editor