Continue last commit, misc changes