Fixed typo
Fixed typo
Fixed print function to not fuck up on integers
Fixed merge conflict, not sure I merged the correct content