big enhancements, handle corner-case barclamps