Another quick merge before attacking color manipulation

these commits are quick bugfixes, including one that fixes #10