Fixed dependency issues.
Added some data to for WebSAFE to use.