extensive interface revamp, some improvements, some fixes