info i stuff and misc cleanup