Fixed a fallthrough bug, minor touchups