Few fixes here (Urgent, current release wont work)

- Result needs set to null before appending numbers
- Switch case needs to be in an else statement, otherwise we reset $result back to $kind (default in switch)