Some changes in header files reorganization, more input variants supported, infamous () bug fixed