Updated Conditions

Added more conditions so the program can handle more options. Still
very buggy.