fixes and tune ups