Minor updates, mainly structure