Added setting interfaces
Small fixes