Added TODO-comments for cause of crashes