bug fixes, slow loading fixes