#3, #1, minor fixes