Fixed parsing

Fixed parsing to account for tabs or additional spaces, also allowing for
larger than one digit numbers.