catching up with development

wow. so many commits. much catching up to do.