A lot of changes I forgot to commit, I won't even try to list them