Fixed some warnings, added brand new interface