remove bugs with variables and parsing input for errors
Preparing to merge with master