Rename some stuff in Graphics.Input
Minor bug fixes