more performance enhancements, cleaned configuration