mess fixing arap bugs