updated format
fixed classname references
Fixed Links