misc stuff plus AT fixes for arrows