More updates, working caching, almost working petide couplings