unified syntax
some fixes