big changes
bunch of fixes