Small additions and language improvements