arrows and bugs fixed