Figured out the cause of slow loading + small changes