Lots of updates... using GSDK by Tim for more prettyness