Improved reloads, quick-fix for kicks

Check the commits themselves for more info.