More conditionals and other niceness