Fixed some major methods