Fixed #472 fixed #471 fixed #465 fixed #464 fixed #442