Finished 1.30, 1.31, 1.32, 1.35, 1.36
Fixing conflicts