fixed most of interface issues