massic commit with revamp of variable definitions etc