half bugs fixed