Update some elements, some merges (not complete with Irina's latest)
Resolved conflicts, commented out timertask until it can be integrated
Some more merge fixes