starting to do some type checking for printing
fixing some merges