added limiting for faster loading and reformatted a bit