Updated code samples and minor stuff