cleaned up a couple interface issues