More work on interface, fixed some memory issues