Bunch of little meta changes