Added all remaining things