bugs fixed at first glance