mod1 branch merged

I merged the branch. Haven't verified that everything still works, but will do so tomorrow at uni.