commit changes from live to git
update features from live with last fixes