fixing decorator bug and other bugs long fixed ago