Added int parsing
Added floats + special cases