new sketch, various bug fixes