final fixes before launch (hopefully)