fixes, changes, bug, optimizations, ordering, speed tweaks