various fixes and new assets class