Add: various improvements and additional support for interface;
Fix: a few minor bugs.