Updated method list, couple small fixes