Interface improved a bit

Plus bugs fixed