More methods and some fixes