started replacing strings with useful types
refactoring, added some more bin ops