Too many changes to summarize

many bug fixes/improvements