added some more language features