fixes in suitable & std templates
@todo: merge with PSR branch by hands =(