Reorganized Input, added lots of internal keywords