- just fixing up some methods;