more fixing + cleanup