remove code that overwrites all data
bug fixes