big cleanupa and fix of pulled interface updates.