bug fixes and if statements

language is almost ready