fixes and faster loading times