moved to asset as directed
fixed up simple stuff