lots of improvements
cubism
static changes
fixes and improvements