Spinners and bugs fixed