challenges: lots of misc. bug fixes