Overhauled loading
Last tweaks