adding lotsa new things, updating some old things (#47)