bunch of minor updates
merged michaels new stuff