A few fixes, tyring to load data from several place and make it work