fix #12 partially, carved out methods from Assets RC, minor code clean up