added methods, modded methods, added minor checks