Work over the weekend

Added changes that I've made over the weekend. Details in commit messages