some semicolon's added