Cleaned interface and some fixes.