Changes I forgot to add in due time ;P