more 4.8.x optimizations

Conflicts:
	Makefile

 Author:    Andre Saddler <dresadd09691@gmail.com>