updated grammar with toal, also small changes so mvn will build