updated some methods

dealing with uninitialized variables etc..