resolved #1; bugs squashed!