interface improvements + bug fixing