Bug fixes, added number input type