lots of bug fixes + demo