finished conclusion, updated other things