Update and fix some methods