Fixed a bug and added addons for input