Faster loading and bugs fixes