updates by Richie

tx a ton mate :-)