restore script change detection to what it was
fix indentation in ctor init
fix layout to abide by the coding standard