Update structure, all help and minor tweaks