@reprhook, remove spurious void tokens sometimes caused by newlines
various improvements
stuff