changes: -moved some elements from -bad to here -Performance improvements -misc fixes and improvements