2.2 Update

Fixed #334
Fixed #318
Fixed #252
Fixed #250
Fixed #113