Made some variables private
Major module updates