Added import for local and frank, and misc changes