More methods and fixes.