Updated some defensive and total methods, will continue after work...