Sync with Zeranoe and tidy up