some minor changes, broken though
changes