moved around member variables
small changes