ok more bugs, more fixing