added ff to genCalCols
minor tweaks
minor tweaks 2
final changes for v0.2-3