improved assets handling; fixed merit controller