More methods + fixes