-- added history functionality
-- added extension functionality
-- code cleanup