added a few things (refer to original post)
comments welcome :-)