final bigfixes