small fixes
no more random quantities
new syntax