some fixes and new demos