Alex updates and additions#2

Brustaf wants to merge 4 commits intoargerlt:mainargerlt/Mart2Aust:mainfrom

Brustaf:Alex_Updates_and_AdditionsBrustaf/Mart2Aust:Alex_Updates_and_AdditionsCopy head branch name to clipboard