Fixed cleanup and added more tabfixes.