version fixes; code cleaning