cleaned up interface a bit amongst other things