-- rolling back changes
-- fixing some errors