better wool names; bugfixes