adding custom input, small improvements