merged in master stuff
added in more master code