Added key assets, added and removed debug code