final fixes (I hope!)