Some shape support; numerous bugfixes