strafe added, shop gen fix
merging strafe