fix #1 and fix int parsing