Update interface and some fixes.