final tweeks and adjustments