Continue the work on the lxc refactor, upgrades & fixes