language change up, bug fixes on skeleton generation