Created input library, general cleanup