better, smaller & faster

bug fixing some and testing a new way of sorting.. works better this
way.