Random leftover commits

Random leftover commits
Fixed stupid merge commit