Small fixes: different browse types according to filename. Removed unused imports.