Added Frege syntax
Fix some problems for Scala dev