added AssetsManager and other tweaks