Bunch of new methods + fixes