fixed conditionals, fixed some string stuff