Added language for conditionals, did some renaming